small updates
merge pull
small updates