Last commit before comp. Minor changes.