minor OCD tweaks
more tweaks