update on #115 and more