made types much less confusing and even removed one