Small optimisations
Commenting debug statements
Bugfix on ifClass, in case T-Class or F-Class are null
Some code optimisations
Small code optimizations;