cleaning structure, added some tech notes
fixing merge