Changed a few things from the previous version, added links to the class reference