replace #define statments for options and variable ids with enums

fixes #36.