Adding 'source' field, some nice-to-haves, and fixing some minor irritations