Fixed: Some general javascript clean-up