Fixed behaviour of INV EE
Fixed Lint errors in Eclipse