fixed several TODO/FIXME tag items