A few more finishing touches