First pass at 187 easy code.
fixes to first part of 187.