take out some debug stuff and a typo
merge conflicts