Updating pre-setup, reformatting a few areas.