Mem Issues Fixed Hopefully