More fixes and documentation