Fixxed bugs in aardvark, should now work