data logging improved + some other things