Done a lot
Minor changes