Fix Write Timeout calculation
Tidy up comments
Remove 2030.mcs
Add missing files