Small convenience fixes and update README