fixes to taunus and overflows