PreMerger

Bug Fixes, prior to merge with bounty table