More documented and other stuff