Debug done, comments remaining.