Cleaned code and bunch of fixes
Changed js name