Fix all the things
Update docs