Fix some title, add in CL options