Fixed and issue with some some incorrect sql that cause the complete payment buttons to not work correctly.  Some other minor tweaks