Fixed issue #116 and other cleanups

- built better README