continue work between dependencies and fix ups