Tidy up
Progress
Fixed permissions
Fixed permissions