fixed issues assigned to cwroger