fixed froken formatting
some updates