update YAC and fix bugs