updates for stewart, minor bug fixes