Small enhancements, clean up, soft-coding changes, added Shot and started integration