2nd update

More minor fixes. Added notifications.