JS Fixes & Incorrect filenames