Added pop and tweaks