improved minor points

mvc is still not correct i guess...