Some bugs fixed

Beholgar

Some bugs fixed..