Prepare for configurability
Settings (and additional string fixes)
Fixes