Started refactoring the shader code
Parameter fiddling
merge
ended up doing more work in master, but forgot to switch...