Changing messages and other formatting details from Bryan's fork.