design changes
several updates