Partial JS format, etc fixes