refactored javascript and did a lot of other stuff
merged branch joh