removed some more bugs