bugfixes after testing with pads