buildout improvements (start with scotty user)