Gandalf: added few comments