Cleaning some stuff up and adding notification for registration