various formatting and notification fixes