Refactoring, bug fix, change in errormessages, start on evaluate
small refactoring