reorder some defs
tweak tests
fill in right/up/down code (too much of it)