Labyrinth 1.1

Some improvements