last couple of tweaks