container options fix and container epilog+prolog shorten