Fixes and new extended settings