Improved Maxis Traits

Various Maxis-made traits which I have added new features to in order to “improve” them.