stupid typo; also added some other stuff