record more gabout S4 / R5 types; fix some completion bugs