Tweaked a lot off stuff