Bug fixing of latest features implemented