working: updated hardware defines and other cleanup