Shields feel much better now, many other small improvements