more design changes, improved comments