More fixes, some documentation too