small updates, final version