Changed a bit of documentation, cleaned up some stuff