JavaDoc clarifications & fix a Guild method