a.txt bug fixes
add edit by joseph
conflicts resolved