Fix API, move stuff and respect cancelled events