fixes

Andy, here is the pull (if I have done it correctly).  It also includes a jqm 1.4 fix.

Cheers Greg