updated icon
fixed typos
fixes for addNotify/removeNotify changes and handling listeners
better singletons