Some more polishing and tweaking