last changes

-a bit of formatting