R4: Some paper cuts and a language bug