Some small touchups before I start on the notifications