added few more bugs to be fixed