cleanigns + doxygen documentation (fixes/complete) + consistency (naming)