added design to workunits and other improvements