Cleaned up model, set more final values for costs