Fixes and Readme update