modified work section, plus other fixes