Minor & cleanup modifs.