Minor updates to fix circular imports
Update key trigger to use a single 'key string', fix error messages