- more fixes for speed