JS and file overhauls