Fixed up context menu stuff
Updated compatibility (because, why not?)