wrap up for today, changed a few things in controllers