Lunsford

Pull request with bug fixes. See separate email for further details.