Aesjs implemented + small fixes