doubled size again, and cleaned up defines