Feature/merge and fixes output