Made a few house keeping changes.