fixing some more problems