changed a bunch of this, added scripts