Turn a XXX into BUG, add (xiaq) to a TODO