Some implementation errors fixed for key expansion, not quite there yet