Updated

Fixed the display (mostly) and corrected some calculation errors.