Add documenttation and toStringX