changed visibility of members, other small changes