fixes and whatnot