Tweaked some of your scripts

Just sharing what I put together based on your project.