Clone feedback fix, refactoring
Fix bugs
Build
Fix jshint
Tests