fixed a lot of formatting problems