FIX: some changes after github import - no bugfixes