Some uniformisation
Added some comments. Refactored/Eliminated dead code. Starting work on target eunit.