updated 'fixme' comments