Fixed aStar and main