fixing some mistakes