Couple bug fixes, plus a new feature!