More shader support
Some cleanup