Fixed various bits, finished events