Big big improvements to magicbar