update readme, clean a little more code