fixed NaN and changed js file locations
Merge branch 'fuzzybabybunny-js'
merged request from fuzzybabybunny locally
merged request form fuzzybabaybunny
about to change to JS branch
fixed conflicts