Second pass after revision plus some small fixes