Comments on stuff to fix