bumped versions; did a little cleanup