Improve singular and add grim_short