fixed formatting, etc