fixed formatting and other things