Couple of fixes + wrapped code to 80 columns