Reworked handling of wedges.

Also changed stats to handle different layouts with separate stats.
Also fixed a few display bugs, and gave most messages better names.