Minor bug fixes and update to README