fixes air quotes and adds FIXME & TODO