fixed scripting issue
more fixes