Making repairs and adding content forwarding

Making repairs and adding content forwarding