fixes, started to convert to the mvc-model