No major changes. Got rid of templates because there was no need for it. Improved formatting and some comments.