misc. changes, most importantly splitting logs