Added most support for MVC

+ lots of smaller fixes