Bug fixes, and a new function here or there.