bugfixes, see assembla 9-10 jan