BugFix and integratio finished