Final formating fixes + small additions