Improved Performance, Removed Doxygen, Added a lot of comments (again)