Final finishing touches hopefully