fixed some over the overflow issues, wasted some time