added fixme's for missing data