phew final tweaks