Fix number of things
Few style changes