Cleaned up data and pruned it a bit
Reworked scripts a bit