I fixed all the issues. It's good to merge now.