JS Errors Fixed