Added Beehive Forum and some clean-up