Improved Aleph Driver

See individual commits for the details.