Some graphics and tweaks