Bugfixes; also added Vector to spring