updated some things
some to ast methods altered