small updates
almost done