More speedups and add Text object