MVC-14, MVC-15 Code review and small fixes + renamed adminn to admin