Fixed name and other things