Some codechanges and bugfixes for L*2