* Reverting a notification setup related change
 * Added some stability and translation improvements