ORIENTATION_MATTERS now handled with #define. Instancing of singleton classes improved.