fixing some more issues