Develop/fixes