some more fixes
fix compile and everything seems to work
removed some debug information and different timing measure