fixing a lot of details
fixing a lot of details