Fixed some bugs and added some graphics