(Hopefully) final touches