speed enhancement, fixes