commented, changed some vars