Added #defines to remove compiler errors
Added #define to fix compiler errors
Changed logging to use the cm10.1 macros.
Some small changes to configuration