Resolver bug fixes and improvements

This PR fixes most (all?) of the open resolver issues on Github.