short thread hiding, minor issues fixed