Graphic and bug fixes