Patricias fixes

Completed fixes asked for by patricia