Bug fixes / Improved readme