Various fixes, tweaks (class smashing :3).