Better higher level operators, fix #14, fix #7