Update

Added switching, fixed notifications a little.