literal support, tests
more fixes