further bug fixes related to handling sets
further bug fixes related to handling sets