Migrated Commandments + fixes
fix