Released a small update which takes care of most of the issues you were having.
Hopefully I didn't screw up :)
1ButtonWonder.
