Corrections, reverese engineered from class files