aesslap fixes and improvements