bug fixes

forgotten changes added.. should have been to previous PR