more step by step compile fixing (and some automated Notification code replacement)