Web implementation and a bit of polishing