- Simplifying TypeSystem (incomplete)
- Fixed tab issues