fixed formatting
more progress