Fixing maain
Fixing thingies
Checking file exists
Most things fixed
Improved packages