update readme, cleanup, add some fixes