improvements now optional via #define