bug fixes and extensions to the ACD spike and its testing