updated methods and re-commented slightly

Updated and modified the methods and attributes a little so that they work with the website