Add events + some cleanup