Improve naming, fix symbol parsing bug, add tests
Add literals for categorical data