just some small form tweaks