minor fixes and whatnots.