fixed stuff etc