Commiting several changes that were made several months ago.