@vjeux comments, fix typehints