added some 'fixme' comments