Clean some reported bugs 4, make deprecated public variables private