Few bugs fixed :)