- Minor changes. Still messing around with it.
- Adding Matt's changes to mine.