lots of changes - style and notifications - need to seperate commmits an...

...d branches more