-Fixed all the issues for the OO version.
-I did not have time to upload the Jquery code.