Fix some formatting and filename issues.