Almost done, final tweaks