warpgate and some cleanup