Make events work, fix things