minor updates, indicated a bug place (fixme)