a couple final changes, about to bug check