Fixes and readme update