settings dependencies fixed
cleanup
Event selection fixed