All bugs fixed

It's all working fine :D