Bug fixes

Fixed messages not being shown and points not being calculated
correctly.