Bug fixes + updated readme