more boss tweaks & shield dash/bash revert