some decorator improvements