Bug fixes and readme update