quick modifications to some things not properly utilizing by_name