bplus
B+ edits and cleanup