small fixes & minor updates
Merge remote-tracking branch 'origin/grar-mvc' into grar-mvc