Add more Fakers, style changes