Light enhancements.

abandoning bb.js for now.