removed i from iMacs name, reorganized to follow more natural order and added clearer comments as to location.