removed workarounds for fixed Canary bugs, fixed some bugs of my own