more #define usage

adjustment for the speed is more granular. refine comments as well