bug fixes, code issue....

Sorry in advanced about this, but had some bad code introduced that I had to get out. This could have a ripple effect. I will work to get it cleaned up asap.