Speed up readhead a little
Various fix