Shadow equipment update (part 2-Complete) and minor cleanup