fixing names/etc