little changes, nothing important
merge between mb and imac