removed extraneous logging statements
fixed collapsed nodes not staying in sync w/ def