Updates! Making things look and generate nicer