better a2* scripts

For #165
Should also help some things seen in #158, etc
Still more more conflicts here I think.