Additional work on bug and fixing bugs encountered