Possibly corrected changes

Added also a todo for Andy.