major mistakes corrected. are the units OK?