Removed warnings and improved graphics.