reverted a few wrongs from previous commits