updates and reorg
minor mods