bugfixes during hardware testing