clean output + improve ai
merge
merge