Few bugs that need to be fixed.