finish notification and bugs