Develop

iterate on warnings