added welcomepage, errorshandle + cleanup