Small fix.
Small cleanups/fixes.
Added quick log macro and printf() style logging.