adding things that went missing in Erics last commit because it broke some code