design changes and other fixes