Bokeh

Clean some WIP in the master...
Damn it