JS refactoring + added some answers + minor tweaks
Merge pull request #53 from MrLesion/development

JS refactoring + added some answers + minor tweaks