sync back

get latest changes,  
minor stuff