Changes for shade jar to resolve conflict issues

Also includes a few bug fixes