Simplified shader, some refactoring
Mothership fixes