made some quick fixes