various fixes and services template