Various code changes and updates.