corrected more package statements. should be good now for a while