restore bugfixes and updates that were lost. flag time dependet. correct use of citeme.
(cherry picked from commit b27179bbef554108d4b0ae15c8b887ed372b2c3c)