fixes upon comments