changed formatting and some other stuff