version handling improved a bit