Pulling in latest fixes from IA fork

Attempting to sync up with IA recent edits. This is a test pull request to see what the outstanding issues are.