cleanup readme and fix a couple bugs