add missing proxy_username setting
remove container_of, remove some underscores in the process