Named column support, more tests, some tweeks based on code analysis