fixes from review of first commit