Improvements, but some bugs left. Refs #9353