small updates, cleaning