Updates

update names and clean up some things