Added comments to FIXMEs/TODOs; fixed req-mgr FIXME