added stuff that didn't get in the last commit