some quick and dirty changes