Hopefully finishing touches