some cleanup, bump versions