alfred fixed and migrated to v2, some various cleanups