Finish comments getters
Finish getters with comments
Add some class invariants + small fixes