A6 and A5 complete, a few minor edits