fixes and yet another optimization