Development

Pull request updating models and other small alterations