Rework a few things. update README