going some steps back, applying bugfixes for Tamboti version 1.2: