huge rework, created runner for the labyrinth, renamings