Just updating commends and fixing types; no real code changes