some changes to version handling