fixed comments?