Updates to model_main, Diss.jl. Removed testing.jl since it wasn't useful.