Added some small overall changes.