switching to fix hbon regex
finished up threading changes