Basic updates and uncommented some methods