Develop

Some fixes