Develop

some fixes