add fixme to resharper tracking etc
tweak some of the todos