Enough for a beta3 I think. Some code changes. Let's see what people think, about to build the beta3 and upload it to curse now.