Comments Module Added + small fixes