updated manually from master

i'm still discovering new problems with my config