Doxygen Work

- Doxygen is currently working (50% progress)
- Minor Bug-fix