Fixed notifications. Cleaned up