updated todo & fixed issue with crit not being applied.