Finishing up and adding a bit of polish