another round of updates plus added the fix for AS-224