final fix on comments