Fixes and readme updates