* Various tweaks from @ethantw