various unchecked issues
Updated json generator
various other cases
last case