Bug fixes + Readme update