Version changes, some cleaning up.