Minor clean up, and extra Vector methods