Major update to some scripts

Signed-off-by: Bert Hajee <hajee@moretIA.com>