various changes to structure, formatting