tweaked a lot, changed a few scripts