new-fb changes to work better with integration branch

Closes GH-99, GH-103, GH-105