Update docs, fix minor bugs