final tweaks (for now)