fixing some errors2