Some cleanups and improvments
Updated README