Bugs fixed

Bugs fixed.....