Fix for inserted codes while registering of extensions, many rewrites/cleanups: