Multiple bug fixes and better README