Immibis' Filler changes

Closes #838