Made the requested changes
Merge pull request #2 from djfrsn/JsTweaks

Made the requested changes