fixing stupid mistakes, in running order

the outputted results are funky, but it runs and it should basically do
what it is supposed to. Need to some back and work on the outputs,
verify it's doing the calculations right and stuff.
running order, output funky

need to work on the output, verify results