Few bugs fixed.