fixes / speed and total