Added and improved scripts