Fixed bugs and added notification

This works already very well, but maybe we have to improve some things
later