Develop

quick fixes