Multiple tweaks to bring bpm console up to date on fuse
Merge pull request #37 from EricWittmann/fuse-7

Multiple tweaks to bring bpm console up to date on fuse