fixed straight-up errors with define usage