container.bean(string) and some minor changes