buffer bugfix, some more analysis annotation