add filesafe_benc, namespace changes.