B39: 1st anniversary commit! (mostly bug fixes)