Update README, fix a few issues