update hext-core code; make use of *Tools -> cleaner code