Cleaned up a bit.
Worked on model section.