Bigfixes and additions

Added new events and fixed bugs