Added some better enable/disable macros. Added testing code for draw library. Updated to most recent libraries.