Added in-painting option

Fixes added, plus new functionality