Random cleanup
Improved literal node parsing
Changed how primitives are handleded