fixing some things 2