Polishing bug fixes + README