bug fix and graphical improvements