Fixed stuff, and more documentation