Changed caps on term
Cleared on initial start
More Cleanup