Updated readme
Minor bug fixes and readme update