Polishing up and adding prettyness