Bug fixes and readme