Shielder improvements and some wave tweaking