Started working on new-style well package. Continued to clean up code.