Getting Closer. Misc Changes