misc. design changes
more design merges