More fixes and readme updates.