small changes in model, start of beaker.js