comments didn't match up with functions; fixed