Cleaned up scripts, tweaked values