Updates from the community mantainted version

@keithgordon4646, If you merge this pull request, you should be current with my latest changes