fix formatting, etc.