More fixes and commenting~