minor changes, scripts is ready for every day use