Minor cleanup
Update notes
Refactor string variable expansion
Another refactoring in config
Don't put database and config in global_options