More work on the status indicators. Some other small changes that probably don't belong on this branch.