Readme + bug fixes