minor fixes; mvc improvements