#467 - misc changes post dev box