Removed trailing spaces, save on focus lost, and other related updated options