added needed fixes