Develop

most issus are solved