further clean up, inprogress work on bust/progress indication