small speed enhancement, updated totos