synching minor changes w/ master.