fixing some more bugs