Fix readme and some clean up