Numbered stuff and made small design changes

suggested by Erik & Mr. H