Cleaning up bMoor code, fixing demos