additional bug fixes in scripts