FiXED all of ma bugs