api_version and some minor tweaks
merge