Some new functions, and some new bugs and frustrations.