fixed outstanding issues