Echo for JS + minor improves to other scripts