Two Script fixes / enhancements

Sorry forgot i already commited pyrewood ambush. DB update will follow tomorrow, see comment