2D vector ops with @macros. +minor bug fix