Version number change, some cleanup