Added graphics, fixed some bugs