fixed stuff!!