[add] Code improvements from 09 dec experiments