More documentation as well as minor fixes