broke & fixed stuff