more small changes. time to commit & submit.