more small scr optimizations