Develop

fixed all mentioned bugs