readme fix, various cleanup