General bug-squashing
Added sample configs