updates from work
tweaks