a7-3 removed
a8 updated
minor fixes