Fixing numerous bugs with Jacks, etc.