bugfixes after initial tb runs
working commit... to sneak into broked titan server with git