small fixes, need to be reviewed