Shielding out of bounds fix + better background