Fixed EditWithHistory so it doesn't store empty strings. Cleanup
Fixed issues with Settings interface.
Fixed more issues with Cli