bug fixes and update to new be13_api