Bug and Graphics Changes

Bug and Graphics Changes