better settings
library updates
Merge branch 'master' into talos
lib updates