Fix casuality for the current bar and add comments