added missing include to helper.h
Ability to add arbitrary defines via OPT
styling issues