Some notifier cleanup
Increase timeouts
Rename main file