next fixes to literals stuff