Bug fix nr. 2 & trying dOxygen

More bugs fixed after test by "external tester" and dOxigen comments
added, no dOxygen file yet..