completed fixes 1-7