reworked a couple things, should be much cleaner now.
cleaning up after new changes.