Misc changes. Good night...