Design and comments

Add comments to files, and improve design.