Bug fix; started on graphical improvements