adjusting timing and other fixes...