tweaked some stuff, fixed some bugs (I havent slept for more than 3 hours at a time in weeks and my memory is failing)