Major style changes and a few updates.