Fixed many bugs and graphical annoyances