updated README
Some micro cleanups and code reordering
fixed merge conflict