- Mostly comments on code 
- One minor change in Controller, old code is still there as a comment