simplify the vector handling
fixes part of #11