comments now fixed