cleaned some stuff up, moved old stuff to old_stuff