Swapping notification arguments
Miscellaneous clean up on installation script