Final A6 with doc and code cleanup