Fixed bugs, added trailing numbers