revised spacing and general fixes.