Commit 27

Some changed to GUI, some attempts to get messages informing player of
what bonuses they are benefiting from. Bit tired today.