final tweaks for now