Some bug fixes - updating re-enabled and seems to be working