Bugfixes for AOPy
Minor feature improvements