Fixed most of issue #65 except for the Linux AA.