Fixed numlit/strlit issues
Tests completed and passing