Updates and some quick style changes.