Add more scripts + include useful error messages