Develop

Pull in Nick's fixes...