Adding some more features that were missing
Updating the scripts some