Clean up notification and change title for notification. Some fixes to random stuff