Fixed Bugs and add some graphics