closed #25: more shortcuts, som optimizations