fixing small details, and making more private