Readme plus couple of bug-fixes