fix up last commit into working state