Improved vertex aa and vector stuff