[elwing]

Thanks a lot for this patch, had most fun that I had for long in tov! Minor adjustments might still be needed but overall a major improvement!