Formatting; filling in bits from actually testing.