last round of updates

new changes