Fixed and cleaned also step count