bufix: fixes #68, fixed #70, fixed #71