Cleaned up more triming and a couple of design changes.