Ai commit and some other polish