More hacks and tweaks