fixed cpu errors that where not cpu errors and reverted the aes change