fix comma thingy and names