Swap files
Corrected many errors and stylistics