Fixed ordering, added trailing period