cleared few more bugs