minor bugfixes - ready for field tests