bug fixes and whatnot