First pass of review/fixes