several fixes, inspired by vector 1.23