Import fixes
Revert commit
Improved readability
Added "global" options
Uncommented dead code
NPE fix