Fix hintify

A few bugs still exist