MVC OOP: some minor bugfixes