Fix some more bugs, add NotificationCompat