Fixed all the remarks.