These l1/l2 decay changes related bugs I introduced are killing me. This should be all of it though.