added new custom settings and small tweaks