Adding xm shader, small tweaks