fixed crazy containters
removed debug output
removing unneeded code
Small styleguide fixes