various design changes and updates