various fixes, minor reorg, and update to read me