updated formatting, fixed a few mistakes