speed up, fixes