fix issues mentioned by Matt.
synchronize with main notebooks