better level 1 for testing, fix a couple of transitions