Several fixes to AOL and tests

C style comments please