fixed stuff to store later