Trim is overzealous

Also some minor things here and there