Refactoring
Marker shaders
Sockets
Several
Tees