small form tweaks