Removed some debugging code; tweaked AO settings; minor code cleanups here and there