Minor tweaks

Should have really done this in two pulls, since one is a feature and one is a bug. Holler if you'd rather I figure out how to break them apart.