code design updated for accuracy

changed a few things, we should write up a new version when we are
further into coding, i can see this going obsolete pretty soon (it's
already inadequate)