godm/sml: added comments and improved raw handling