improved scripts a tiny bit