Added shader
Other small improvements