fixes and updates to support wider range of configs