some tweaks to debug things to try and speed things up