clean up possible kinds, update versioning/version