Some cleanup updates and better readme

Some cleanup updates and better readme