Commented nearly everything
Fixed conflicts and commented more. Honestly I think every comment in this project is mine. Do people not comment anymore? bah!