Cleaned scripts a bit, ready to test