fixing up some old issues