further design changes and minor tweeks