Review and general fixes.