This brings no particular changes, but hopefully coding will start again soon. I just changed two methods to dynamically get the UhcCore instance instead of taking it as an argument.
