update readme and more clean up