Misc updates + fix jQuery script tag bug