added some #defines and changed class public variables to functions