removed defines with no ill effects, everything is dynamically allocated now