Update #2.1

Cleaned up some formatting
Added Comments
Still have to added small parts