Added and corrected Classes

Affected:
- Many Domain Classes
- Some GUI Classes