removed macros for c++11 features; gizmo scaling