Bigger timeout and some minor stuff
Forgot the .js