updates
updated all a bit