bugfixes (work fixes)